[automerger] Adding support for badging instant app icons. am: f5523921c3

Change-Id: Ic058018cd1e7872e039dc4b05923594b0f0e96c3