Merge changes from topic "presubmit-am-e3c1888c62794717b02f19ce77d046a6" into sc-qpr1-dev am: 0dc764cba5 am: 2c3b6005d9 am: 6d424fb48f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16358101 Change-Id: I331fc3c45bf939c9deeefa87c474236a63d68b9b
This commit is contained in: