[automerger skipped] Merge "Add feature flag for flagging manifest entries"...

[automerger skipped] Merge "Add feature flag for flagging manifest entries" into main am: 41e6cc17 am: 0164da72 am: da0a16b3 -s ours

am skip reason: Merged-In I499b6a99e53775abf084f741802463940730091a with SHA-1 0b6c1226 is already in history

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



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