Merge "Add core scoped storage host test to test mapping." into mainline-prod am: 72c41516

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

Change-Id: I3941bcff91f74d5dd01904e0f3a9131b0afad02b