Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev am: 964a1e0f am: 17999f4e am: c1817c7b

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

Change-Id: Ic8065444a360f55654db0c14854d8ca1a4995401