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 am: 7c87a4ea

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



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