Merge changes from topic "presubmit-am-1bbd0f65340f4740a2eb6e4b49c5bdca" into sc-dev-plus-aosp am: 34c94467

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

Change-Id: Ifbba3da1ee63c6d9cf6149df5c446b81946f39f7