[automerger skipped] Merge "DO NOT MERGE:Skip testSanity for the data only devices" into pie-cts-dev
am: 8d229f6908  -s ours

Change-Id: If0e7d9ebc9cb8fb84b21bdb8c6b9c62f019fce26