Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e531 am: 4624b528

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



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