Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 am: 40019f876b

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

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