Merge "Automatically fix bad FRP block written by Android 14 Beta 2" into udc-dev am: 385d2a0f

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



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