Merge "Only allow load frro drawables from frro directory" into udc-dev am: 8f7e233b

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



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