Merge changes from topic "presubmit-am-31e2cf59f8e14c2cb90f5ce39ffc53ba" into sc-v2-dev-plus-aosp am: 15da7c9828
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16827478 Change-Id: Ic4f96e498fac158086165568185a41be8c4f3eaf
This commit is contained in: