Merge "Merge "Use compat flags to reflect the current status of legacy storage." into rvc-dev am: 6838c0ef am: 60d85a42" into rvc-d1-dev-plus-aosp