Merge changes from topic "am-1d5661f5f4774141ac1e057c4692f16a" into...

Merge changes from topic "am-1d5661f5f4774141ac1e057c4692f16a" into udc-qpr-dev-plus-aosp am: 1648abd0

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



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