Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into...

Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-dev-plus-aosp am: d9195947 am: 7c7eef4b am: dfdf2620

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

Change-Id: I1386c748b30430f681fab48bbda58bff664f3cf5