[automerger skipped] Merge "Merge "Use compat flags to reflect the current...

[automerger skipped] 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 am: 803970a8 am: 08ad57c2 -s ours

am skip reason: skipped by user abkaur

Change-Id: I0a8c794f5fa4f8af2be1fd380904c5c4432fc61b