[automerger skipped] Merge changes from topic "pattern-view-size" into...

[automerger skipped] Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27e am: 81974ace -s ours

am skip reason: Merged-In I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad with SHA-1 c2bfb4fb is already in history

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



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