Merge "Check if the activity translucency was converted before converted back....
Merge "Check if the activity translucency was converted before converted back. am: 39dd370d am: fe9e68a6" into nyc-mr2-dev-plus-aosp
am: 97efbc12
Change-Id: Ib974a49f3b8a829153322fb1e04d185c0180da8e