Merge changes from topic "am-a9acf907cedd41c3acc121296a65e027" into...

Merge changes from topic "am-a9acf907cedd41c3acc121296a65e027" into rvc-d1-dev-plus-aosp am: 5b92d256 am: 27b718a3

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

Change-Id: I46f3cc8e0746c57c56b943976c15f755591c0da3