[automerger skipped] Merge changes I32306fb8,Ic06c4535,I70c26232 into...

[automerger skipped] Merge changes I32306fb8,Ic06c4535,I70c26232 into udc-dev-plus-aosp am: 02add5fc am: 19429041 -s ours

am skip reason: Merged-In I32306fb8473c655e68d89d63a1e4f00c8bb5d61f with SHA-1 3e8eacc1 is already in history

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



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