Merge "Add subplans and extend retry feature for CTS/GTS" into nougat-cts-dev
am: 87e4a4ce58

Change-Id: If20477e222d918f0549d743b1e4b8fb67c04bc2d