[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev...

[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a7038 -s ours am: 5610be24 -s ours am: 228673a5 -s ours am: 68b65e86 -s ours

am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 f8722adf is in history

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

Change-Id: Id5a65b4b1ba7db966d02b8c65fba978508d3d51e