Merge "Merge "Merge "[automerger skipped] Merge "Merge "Flush json writer when collecitng extended device info." into nougat-mr1-cts-dev am: e62f8d54" into oreo-cts-dev am: fcca1187 -s ours" into oreo-mr1-cts-dev am: a8a977b5" into pie-cts-dev am: e9d5cd97"
