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

Change-Id: Ie65492f690fcbe916f336728475d927511a5c098