Merge "Use --revert-annotation instead of --hide-annotation" into main am:...

Merge "Use --revert-annotation instead of --hide-annotation" into main am: 550a0dab am: f384a089 am: 0e02a14a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2870808



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