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

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

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