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