Merge changes from topic "cherrypicker-L57400000962989790:N15400001403861226" into udc-qpr-dev am: cd15fed585

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

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