Merge "AdbService sends callback on adb debugging enabled / disabled." am: 6efa908b95 am: 870e9c266b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775965

Change-Id: I54a60b127532a7a8ea4f20c597789362ac2eb47f