Merge "Merge "Check if the activity translucency was converted before...
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e am: a95e7a2b" into nyc-mr2-dev-plus-aosp
am: a91bafc3
Change-Id: I2b3989a255c90906db03280162c2c3cec1f77ee5