Merge "Enable NameNotFoundException on Ravenwood" into main am: 129d38072f am: c32dd8d0f0

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

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