Merge changes from topic "am-7f85af98744840e5a63dc172f3676c6c" into rvc-d1-dev-plus-aosp am: 1de3df06 am: 0a201732

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

Change-Id: I32ee963e961d73f49a6456a511f2eaba150c10d8