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

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

Change-Id: I6997b6cfefaa115c092d15734e37206b84f89c18