Merge "Add new feature flags for the safer intents project" into main am: 62b94e7e

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



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