Merge changes from topic "am-35a2a7dc166049afa7b7683d9a6ad486" into rvc-dev am: 65b5eb12 am: 0a2b5422

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

Change-Id: I576c773226f085be083693065bf9483221cbeed0