[automerger skipped] Merge "Consolidate ActivityStack#finishCurrentActivityLocked checking" am: 1b90887629 am: 02e3db1499
am: 9b8b62f753 -s ours
am skip reason: change_id If1907d71135158bafea69881205f351ab666025e with SHA1 50b81545bd is in history

Change-Id: I5e5985b57b208c49fc7067dac8d5557e8259c83a