am ee5d512d: am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev

* commit 'ee5d512d624c15fa0c7e179ace24c7055a9f539d':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.