Merge "Account for padding in KeyguardStatusBarView" into rvc-dev am: da6e556c am: 17b9566a am: c4a3d6ba am: e6aac502 Change-Id: Ia48ac791f48be9369ee81e63604aba7bea7bc5ba