Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b9...

Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b9 am: 99635324 am: e19ca055 am: 1facd8a5

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

Change-Id: Idbca1af3ac3837e28ee7fed656edffd50e886df0