am 46b57ce3: am aed96e1b: Merge "Add hotword detection in insecure keyguard" into klp-dev

* commit '46b57ce3a1738e1907998463377e8a5bcba3664e':
  Add hotword detection in insecure keyguard