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

Change-Id: I9636743415592c0ba048a636c18b359eb8fab0df