Merge "Minor refactor to make HACK easier to apply." into udc-dev am:...

Merge "Minor refactor to make HACK easier to apply." into udc-dev am: e1b9de80 am: 06dd9105 am: f2395e1d am: 70193dd6

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



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