Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-dev-plus-aosp am: acd8adf89a am: 394439f515
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903068 Change-Id: I2d5a2da45cb129ab411091b6c56577a0fdc6b418
This commit is contained in: