Merge "Do not pause resumed activity in resumeTopActivityUncheckedLocked." into oc-dev
am: 9240fffcbb

Change-Id: I9a18f9f58dff2fb8eeee4ef3849593592d72667c