[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-99b870448c8c43b2815c42861ac6235c-rvc-dev" into rvc-dev am: df554bb5 am: 950d9ad0 -s ours

am skip reason: Change-Id I0b07a0b520dedb479bf863fbfe898ae85b84b0f3 with SHA-1 833f4f6f is in history

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

Change-Id: Ifc6c1d419f8bb6556a95a706d53fcf93971c505d