Merge changes from topic "am-35a2a7dc166049afa7b7683d9a6ad486" into rvc-dev...

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

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

Change-Id: I77e62c19a742cf68097319f882b4eb136a1698a7