Merge "Restrict use of framework-annotations" into main am: 99624608 am: 587b0bc8

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



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