am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad

* commit 'bf4ce93c84400357a28f78a76df62b550e7f85d1':
  adjust keyguard camera layout to make buttons match