Merge "Add flags for new features" into main am: 90cd1955

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



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