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

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

Change-Id: I5b77e268a00b6ded0f74d26e1d23dec28599ce57