Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-dev-plus-aosp am: 2bced2c85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603 Change-Id: Id611dfe23065ad49688067854f6f246dd66aeaa7
This commit is contained in: