Merge "Parent:     cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author:     Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit:     Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000"