[automerger skipped] Merge "Use @EnableFlags and @DisableFlags annotations instead of soon-to-be deprecated methods." into main am: 2d140714 am: 94dc45cd -s ours

am skip reason: Merged-In I7661dd73c3f9d0e44cabd928b96cf2affc9cae22 with SHA-1 3d75c8a0 is already in history

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



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