Merge changes from topic "b249848655-BinderRanking" into udc-qpr-dev am: 78a4a549 am: 59110cd2

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



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