Merge "Respect MANAGE_EXTERNAL_STORAGE in checks for READ/WRITE_EXTERNAL_STORAGE" into rvc-dev am: 27d6605c52 am: 4a911583b3

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

Change-Id: Ia9092c89bbc6ae84e73f84981244479f8b0cecc8