Merge changes from topic "presubmit-am-67b00fe875b44d77afdb1ce083f53101" into sc-dev-plus-aosp am: fcaeb0f6

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

Change-Id: Ib12d74f8cfab9f32d7ea92dcd71b415c691b9e63