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

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



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