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

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

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