[automerger skipped] Merge "Change the access of cellX/Y of...

[automerger skipped] Merge "Change the access of cellX/Y of CellLayoutLayoutParams to private" into tm-qpr-dev am: 51971444 am: 075bd276 -s ours

am skip reason: Merged-In I20367974e5a4cead406e18eb66dafd4d59651b2a with SHA-1 a955403b is already in history

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



Change-Id: I64d289dac80c59944cb8346ea8859f07c3fc865c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>