[automerger skipped] Merge changes Ibba269bc,I399d34e1 into udc-qpr-dev am: 50d5d35b8e -s ours

am skip reason: Merged-In Ibba269bc4851ad898b046ad9d05bb6f708465feb with SHA-1 57bf60dd7b is already in history

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

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