Merge changes from topic "presubmit-am-54e4845950504a539a3613428007324a" into...

Merge changes from topic "presubmit-am-54e4845950504a539a3613428007324a" into sc-v2-dev-plus-aosp am: 2101d2fc am: 0607ae4f am: 78992f0e

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

Change-Id: I55c8b505dfe67521427b500bc8aeff3d33fe7a97