Merge changes from topic "295555884" into udc-qpr-dev am: 03aae8eb9c

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

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