Merge "Merge "Flush json writer when collecitng extended device info." into nougat-mr1-cts-dev am: e62f8d54" into oreo-cts-dev