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

Change-Id: Ia9f3f040dbac3b1f656e50fb1d52848d0ea85f3a