tree 956b03509d6f5abc8e4c26e268fb2122352c247e
parent 20c0cd6b4c49da5925fb92508cdf46056e39a42f
author Ivan Lozano <ivanlozano@google.com> 1595956205 -0400
committer Ivan Lozano <ivanlozano@google.com> 1595956677 -0400

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

 #inclusivefixit

Also re-order incorrectly ordered imports.

Bug: 161896447
Test: mma
Change-Id: Icc876290ca169ebfddba1975de9f28a39ec863ab