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

Merge "Add flags for new features" into main am: 90cd1955 am: d48e4362 am: 9026542e am: 79e14414 am: 558bed5d

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



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