[automerger skipped] Build the payload image only during apk-in-apex signing am: a28c5266 -s ours
am skip reason: Change-Id I8332b2ee84832fb196f2e1c4309abac5ab92e153 with SHA-1 c180a5d2 is in history
Change-Id: Ie7da127cf01befd47e2450f593cffb0ff57e0c1a