Merge "Track test runtime am: 6ab6b542b3" into nougat-mr1-cts-dev