Merge changes from topic "presubmit-am-ff7699f855c14d1ca2c8a3438a9402f0" into...

Merge changes from topic "presubmit-am-ff7699f855c14d1ca2c8a3438a9402f0" into sc-v2-dev-plus-aosp am: 85162b65 am: 7372e21e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348714

Change-Id: If46b5cfe388c781f3c7dc517d77e133b188772ae