Merge "Backport fixes and enable new Dagger Validations" into main am: 3cd9445048

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

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