Merge "Abstract some transition checks so they can be expanded." into sc-dev am: 86234a6ebd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474121

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaf634c14ab37e70fcf448f413e4fa5aee5dafd6