[automerger skipped] Merge "Add a hidden API to detect ravenwood environment" into main am: 366569ad09 am: 583615dc67 -s ours

am skip reason: Merged-In Ice651a55cad092514466dd56940a2cf7b2285e4e with SHA-1 110c3175c8 is already in history

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

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