Merge changes from topic "am-35a2a7dc166049afa7b7683d9a6ad486" into rvc-dev am: 65b5eb12 am: 17f7cefe

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

Change-Id: Ic1aa93d9d25a5345473f27514f3e97290e4d505a