[automerger skipped] Merge "Ensuring consistent default emit values to build"...

[automerger skipped] Merge "Ensuring consistent default emit values to build" into udc-dev am: ffd922ac am: 4b15d659 -s ours

am skip reason: Merged-In Iba5274e23b54495dbfe2962f014fe4914462a115 with SHA-1 9540f4ab is already in history

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



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