[automerger skipped] Merge "[DO NOT MERGE] Remove backup/restore CTS tests on M" into marshmallow-cts-dev
am: ab96691f64  -s ours

Change-Id: I896da0c7626e61a85e9ffb15d0840206fc2dfeaa