Merge changes from topic "am-57d54eba49bd4bd898282201c28befa4" into...

Merge changes from topic "am-57d54eba49bd4bd898282201c28befa4" into rvc-d1-dev-plus-aosp am: bcf0775b am: 4b6a957b

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

Change-Id: I96c13e2bbbaab25a0cf61823c051ca251b40cdf8