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