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

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



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