Merge "Fix overlapping Manage and Clear all buttons when display scale is at...

Merge "Fix overlapping Manage and Clear all buttons when display scale is at maximum" into udc-qpr-dev am: 911e2049

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



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