[automerger skipped] Merge "AOSP/Launcher3 - Update language to comply with...

[automerger skipped] Merge "AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance.  DO NOT MERGE" am: af6968dc am: c7e0fc92 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245

Change-Id: I2fdfd4d0e070d887121b53d557114083d4ed9501