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

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

Change-Id: I45ed90d37022f77f615ccbd20cf4ca0b8be55b53