Merge "Merge "DO NOT MERGE: disable tests that fail on some devices (Hammerhead)" into marshmallow-cts-dev am: 4bdac6298c  -s ours" into nougat-cts-dev