Merge changes from topic "am-a00dfb2e5ead4a66921d6a79afb923ab" into...

Merge changes from topic "am-a00dfb2e5ead4a66921d6a79afb923ab" into udc-qpr-dev-plus-aosp am: feb5bae9

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



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