[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "freezer_binder_callback-udc-qpr-dev" into udc-qpr-dev am: 4763a131 am: 78ec88d8 -s ours

am skip reason: Merged-In I380c892a6cb92adfe739fb9cafca3c902772a384 with SHA-1 d0a3ce04 is already in history

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



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