Merge "Make sure we preserve preserveLegacyExternalStorage." into rvc-qpr-dev am: 50402a42f8

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

Change-Id: I7158ea9d8a012617fba4d64a96d0e1dfeca413c1