[automerger skipped] Merge "[DO NOT MERGE] Fix CTS case : android.server.am.lifecycle.ActivityLifecycleTests#testPausedWhenRestartedFromInNonFocusedStack" into pie-cts-dev am: 0e10226839 -s ours
am: ef089311d4 -s ours
am skip reason: subject contains skip directive

Change-Id: I88a43d7997ca1243fe90774f69210474ba8d1d97