Merge changes from topic "freezer_binder_callback-udc-qpr-dev" into udc-qpr-dev am: 4763a131

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



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