[automerger skipped] Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: aac3b2ead0 am: ae18ba8e91 -s ours

am skip reason: Change-Id I49bc336a276d30152402eba926cc583bc81e8e5c with SHA-1 6c633de59e is in history

Change-Id: I3daa7e0ca0e035c83d1e2f2ac839cebfae33d2fe
tree: ec0f18a5af572441173d7e333032ef37c0905d40
  1. Tethering/