[automerger skipped] Merge "Add tethering event callback API" am: 5227285ad7 am: b14afc3a5f
am: 6018db93d7 -s ours
am skip reason: change_id I7ca81b27c9b805cc01884509f5b20d9d0a24cd36 with SHA1 6ea3454f07 is in history

Change-Id: Id6a807ce24b007384caa23385127e7f6e3093e1a