[automerger skipped] Merge "Enable use of error prone annotations" into main am: f536041bbf am: d16cc39179 -s ours

am skip reason: Merged-In I561d0af95619c70a30fc97e580d7ec8df9120a57 with SHA-1 e16d9bea19 is already in history

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

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