[automerger skipped] Merge "Only allow load frro drawables from frro...

[automerger skipped] Merge "Only allow load frro drawables from frro directory" into udc-qpr-dev am: d8d9d54f -s ours

am skip reason: Merged-In I4247e54f3ea0d9e4bf0d9f404e0272751a258ba2 with SHA-1 12e49e7a is already in history

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



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