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

[automerger skipped] Merge "Only allow load frro drawables from frro directory" into udc-dev am: 8f7e233b am: 16d7e749 -s ours

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

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



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