Merge "Fix layout problem in "All apps" view" into sc-v2-dev am: f1d527ff0b

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

Change-Id: Id1052737cd0d03b1a0fe3a36a59695c06a9b5109