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

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

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