Merge changes from topic "am-a5e6e7f0ee9548ee944fad69eaa48fba" into sc-v2-dev-plus-aosp am: 5cc0b0f5

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

Change-Id: I38a07cdc608afcd4148ba90583bf3c1d09504d12