[automerger skipped] Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: f3022ca483 am: 23d4aa37a3 -s ours am: 525d3d1ae9 -s ours am: 7505afea58 -s ours am: 242fe6b224 -s ours
am skip reason: Change-Id I49bc336a276d30152402eba926cc583bc81e8e5c with SHA-1 a9944c2d04 is in history
Change-Id: I82d902058121a73ba518c602df09dbe414c21512
This commit is contained in: