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

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

Change-Id: I58536f75ebb7fa4ed177303837803a48df5d41b0