Merge changes from topic "b169435530-ExtrasOverriden" into udc-dev am: d62eae97

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



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