Rearrange imports to avoid IDE from auto arranging everytime

Test: No-op change
Bug: N.A.
Change-Id: I770e7952368c92c5f12aca5bee8273bf94b7315f
1 file changed