Merge "Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev am: d08c064976" into oc-dev-plus-aosp
am: 85d2e85f12

Change-Id: I1e397b1b030d1b88ca5873af9288ac4738af2a1c