Merge "Update error on ROM 9891405" into udc-dev am: ad0b17de7e

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet-sepolicy/+/22525902

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