Merge changes from topic "am-869612ecfd6a46e1a42e1033e590caa6" into...

Merge changes from topic "am-869612ecfd6a46e1a42e1033e590caa6" into sc-v2-dev-plus-aosp am: 55b34bb2

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

Change-Id: I5a41e685ef7a917eef8c341792fffc1e62c41904