Merge "Add feature flag for flagging manifest entries" into main am: 41e6cc1768

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

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