Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp am: 78938367

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



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