Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27e

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



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