Merge changes from topic "am-9721981bd6094afba0e91012037b191f" into...

Merge changes from topic "am-9721981bd6094afba0e91012037b191f" into udc-qpr-dev-plus-aosp am: 7ff831a2

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



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