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

Change-Id: Iaf68728e95932a95b3933596d67bf2d32fed76e5