Merge changes from topic "b160781930-upgrade-dagger-rvc-dev-plus-aosp" into...

Merge changes from topic "b160781930-upgrade-dagger-rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: e179b819 am: 3539f1e2

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

Change-Id: I05594a2183c6e38be802285bc68efedb9e6a74ce