[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "b160781930-upgrade-dagger-rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: e179b819 am: 3539f1e2 am: 7b6612e9 -s ours

am skip reason: Change-Id Ic3b43bb8247c6a7ebe4257651bcb5de51699c60a with SHA-1 dffcc471 is in history

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

Change-Id: Ic959a6b68b084b8cecea353c7ff92ee15677b0fa