[automerger skipped] Shim apex is installable and overridden by prebuilt. am: 9a64da66f6 am: 3c063cd75a am: cabb02c5ba -s ours
am skip reason: Change-Id I69db85c398c902f2d05591e076db8a922dd56283 with SHA-1 46c9f91396 is in history

Change-Id: Ibb16dbe9882b246aecc44a5401b6b826db42b3b9