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

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



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