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

Change-Id: Ieb53c2c59a0abbde867981bf83f217eac8fc3f3e