Merge "Add flags for new features" into main am: 90cd1955ca am: d48e43620e am: 9026542e92 am: 79e1441405

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

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