[automerger] Some launcher3 fixes so that it compiles with different configurations am: d0f43ceba7

Change-Id: I4886d9a1880c35ebb36ccda20401e6c7e394dad9