Merge "Wait until activity is destroyed before finishing SessionLifecycleTest." into pie-cts-dev
am: b7d35ce25b

Change-Id: I3e18bae6303a05ba47b9416d8a031e2e8f81ed88