Merge "Add flags for testing Ravenwood" into main am: b1071dc678

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

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