Merge changes from topic "am-048332da756543d6b9652d2cf45fb05e" into...

Merge changes from topic "am-048332da756543d6b9652d2cf45fb05e" into udc-qpr-dev-plus-aosp am: 438b16f7 -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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