Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422
am: 6b24f367f8
* commit '6b24f367f8ed4ba9dcd406094478f79ea8e7f68a':
Change-Id: Ibce1b4eeda65187e994ebdfb63bbff0ec82bf813
This commit is contained in: