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

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



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