Merge changes from topic "am-99e71ad1563b4cdeb52b5ebeabd86305" into...

Merge changes from topic "am-99e71ad1563b4cdeb52b5ebeabd86305" into udc-qpr-dev-plus-aosp am: 2f1a55da

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



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