[automerger skipped] Merge "Enable use of error prone annotations" into...

[automerger skipped] Merge "Enable use of error prone annotations" into udc-mainline-prod am: 4cb6c852 -s ours

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

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



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