Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into...

Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into udc-qpr-dev-plus-aosp am: 94659b57

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



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