[automerger skipped] Merge "DO NOT MERGE: Reordered imports according to Android style."
am: ea829b5ba7  -s ours

Change-Id: Icb084a2e69aa4456583b10c9a05836f4a34ab583