Merge "Move ravenwood annotations to module-utils (1/2)" into main am: 6269058bf6

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

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