Merge "remount: prefer 'cache' backing storage for non-A/B devices" am:...

Merge "remount: prefer 'cache' backing storage for non-A/B devices" am: 955460e5 am: 35b42f35 am: 549c6591

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2276426



Change-Id: Ief9879f9ca248630c8c5642be1c2bbd7daa8dac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>