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