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