[automerger skipped] Merge "Backport fixes and enable new Dagger Validations" into main am: 3cd94450 am: 7fe423a1 -s ours

am skip reason: Merged-In I0aef5464000d30b27097ddaed9548d128bedccf6 with SHA-1 f69c3423 is already in history

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



Change-Id: Ic43384ac48cf7e59a6bbd70d9765209db2bc3588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>