Merge changes from topic "am-ab7bc1e5c00341dd99229d3890609eca" into rvc-d1-dev-plus-aosp am: 3976ec55 am: 13e9ed7d

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

Change-Id: I352a889cfc10797e9c0d4ad4929877bb98c4872e