Merge "Fix Ravenwood annotations to be in sync with goog/main" into aosp-main-future am: 3aa51594

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



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