Merge "Conform to new naming" into sc-dev am: 2db3ded7f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b9c18ccf204d5fa5b92bbde1e9e8b388daf3d1c