[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: d2b3bc9885 -s ours

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

Change-Id: I82d902058121a73ba518c602df09dbe414c21512
tree: fc76b0e9f207496c5e43933a4e9619fdb643309a
  1. Tethering/