Merge "Merge changes Ia6019681,Id36f6cb0,I070bf6d5,Ifd13da3b,I99373152 into...

Merge "Merge changes Ia6019681,Id36f6cb0,I070bf6d5,Ifd13da3b,I99373152 into udc-qpr-dev am: 852e73de" into udc-qpr-dev-plus-aosp am: 42ec695e

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



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