Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into sc-dev-plus-aosp am: 2c66e4e4 am: 81abd270 am: dc852858

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

Change-Id: Ibdefb5cdb9d9cfeebcf2f81274fd2616af488e07