am 6e4ee9d5: Merge "Make onClickHandler in KeyguardHostView a weak reference" into klp-dev

* commit '6e4ee9d50f59b15a523d6e252b7f3f2dc8b773f5':
  Make onClickHandler in KeyguardHostView a weak reference