am ae3f7cca: Merge "Add app_name to keyguard package."

* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
  Add app_name to keyguard package.