am f535a6ae: am 5ab93d87: Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev

* commit 'f535a6aef04b9673a0f6748da0018b962833dd9e':
  reduce garbage generation in KeyguardTransportControlView.