[automerger skipped] Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev am: 7775af2778
am: 684eb30cb4  -s ours

Change-Id: I860033381de790bc76a587c8cda34666214681a0