Merge "Add feature flag for flagging manifest entries" into main am: 41e6cc17 am: 0164da72

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



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