Merge "[Provider Model] Fixed the height of the WiFi list" into sc-v2-dev am: 32e6121883 am: 944762a6ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16346901

Change-Id: I43a828bf663da82aaf219e048a93267c33de3c0f