[automerger skipped] Merge "Allow to add a bug number to ravenwood...

[automerger skipped] Merge "Allow to add a bug number to ravenwood annotations" into main am: 0b2e96d5 am: 927123a7 -s ours

am skip reason: Merged-In I50389646482067671f1df6f159561e9058eca4e3 with SHA-1 7aca35e2 is already in history

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



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