Merge changes from topic "presubmit-am-01a5e579a8c54e84a6f02bb53e4352e3" into sc-dev-plus-aosp am: 413a5b6efe am: 6bcb239e77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590939 Change-Id: Iaec5283bd2175276420b43387a3d28a0d740936b
This commit is contained in: