Merge "Fix scroll bar wierdness on QS page." into udc-mainline-prod am: d678490a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23433418



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