Merge "Consolidate ActivityStack#finishCurrentActivityLocked checking"
am: 1b90887629

Change-Id: Icbcdb2d841fd52306f067c7606b78918c6f70894