[automerger skipped] Enable use of error prone annotations am: 61d204ec -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: Iba3dbe999d299f13fdf5d4e6153897ae8fceb0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>