am d6957d5f: Merge "Prevent authenticators from using Settings to  launch arbitrary activities." into klp-dev

* commit 'd6957d5f8ddf3b542996955bf2d6efe0e9804ef4':
  Prevent authenticators from using Settings to  launch arbitrary activities.