Merge "Fix public variables to not have 'm' prefix" into sc-v2-dev am: f1aa726e9f am: 6c3530c6d7

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

Change-Id: If0b071648cc0748d1c119400469e8017fb7e9f8b