Merge "Account for padding in KeyguardStatusBarView" into rvc-dev am: da6e556c am: eb3a7c65 am: 30cb8dc5 Change-Id: Ifb46c8c3181b2b6fe782d797f5b1fa3262c33fd1