Merge changes I5fa8e022,I519fcb99,Ide0e632d into udc-qpr-dev am: eecbe7a9

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



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