Merge changes from topic "presubmit-am-e1fc50fa0faa4d99aa3c954335c1c49a" into sc-dev-plus-aosp am: 6bbc81d033
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899944 Change-Id: I3917cfe4e6f7497941912fdd47e13f2e500dd232
This commit is contained in: