[automerger skipped] Merge "[RESTRICT AUTOMERGE] added Hotspot.apk" into pi-dev am: c070759714 -s ours am: 50245aae26 am: 518b4b3798
am: 32fe3a72ac

Change-Id: I1ee663a392eb814d378872787500a4edd4134c2b