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

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



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