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

Change-Id: I16b6bd1905880f96b6a2d47915556b9775a3689a