Merge changes from topic "am-58dff2fcd6154772939abf557ea150e4" into...

Merge changes from topic "am-58dff2fcd6154772939abf557ea150e4" into udc-qpr-dev-plus-aosp am: 2c9c8b4d

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



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