Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b932 am: 9963532438

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

Change-Id: Iaf7fb99e0e99aa710963686d28a4810f460f01ec