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

Change-Id: Icda846a1be23665eaa512efadd8ec1935f9ed555