Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-dev-plus-aosp am: 76d2c850b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748028 Change-Id: I7638c6bb18cf236a8d2d8234fca838af75a45455
This commit is contained in: