Merge "CTS fixes for Wear, which don't support backup feature" into oreo-cts-dev
am: b63c8f2a57

Change-Id: I332526489fc05785b452cf865b3ecaff01fcec39