Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
am: 7775af2778

Change-Id: I54d224436509531cfd0e33cce97d8471c0867447