Merge "Align Keyguard statusBar margin padding to phone's" into sc-qpr1-dev am: 2974556789

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

Change-Id: I75841f8712eb499363468e04f3360f50232aafaf