Merge changes from topic "presubmit-am-1b5cf7c12da84505927afb0314fbb5cf" into sc-dev-plus-aosp am: dcd84fa795 am: 174e6b8ccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15902752 Change-Id: Ia57f0d16b8ccc6f72bad05a9a80b0e642d1c9824
This commit is contained in: