[automerger skipped] Merge "Use ApexInfo.moduleName" am: 760e80c1e9 -s ours
am: a3c24462e8 -s ours
am skip reason: change_id If0bd3d368c7373ab0028211a8a4246a9821893af with SHA1 b4eee2a17d is in history

Change-Id: Iee756a5abb4e5e101a55027d05ef7f5b889ad019