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

Merge changes from topic "am-d9862b51265846778342e6b987ca5d3b" into rvc-d1-dev-plus-aosp am: 1ad3043b am: 23c25896

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

Change-Id: I93a9bdeef5d486d98ca3082f393f98c723dbd156