Merge "Add preserveLegacyExternalStorage to dumpsys" into rvc-dev am: 8a7e8b84 am: feeae5ad am: 770e791c Change-Id: If18e548ee9e003f99ea157bb2440ec9edd7c1208