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