Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into sc-dev-plus-aosp am: 3696edd2

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

Change-Id: I0636ed61a9e014386ede746d267a91f28d40c474