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

Change-Id: Id6a6bf1e7acdcd075adeb4be24b0b5ef2cfa4dca