Merge "Minor refactor to make HACK easier to apply." into udc-dev am: e1b9de80 am: 7b58c141 am: 5998dd78 am: b71c7410

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



Change-Id: If9183068c4b95d10fb383c78e1ad0ab7c2136aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>