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

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

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