[automerger skipped] Merge changes I706ce9bb,I3fcc4e7a into udc-mainline-prod...

[automerger skipped] Merge changes I706ce9bb,I3fcc4e7a into udc-mainline-prod am: 705280cd -s ours

am skip reason: Merged-In I706ce9bbc7d53c7b734d36a0deb4556c854a5190 with SHA-1 46e379dc is already in history

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



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