Merge "Merge "Track test runtime" into nougat-cts-dev am: 81ddebac0d" into nougat-mr1-cts-dev