Merge "CheckpointHostTest: Skip on pre-Q devices." into qt-dev am: 0e6ce20da1
am: 9f37b11d66

Change-Id: Iefcd22abb79f3315c03592c4402603640288895f