Merge "Fix double counting of margins in keygaurd status bar view" into tm-dev...

Merge "Fix double counting of margins in keygaurd status bar view" into tm-dev am: 9406ddaa am: 039e27fc

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



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