Merge "Match keyguard and regular status bar height on large screens" into...

Merge "Match keyguard and regular status bar height on large screens" into tm-qpr-dev am: 1ca9fd74 am: 61e3abd9

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



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