Merge \"Merge \\\"Include new constant for encryption status in the...
Merge \"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf76 am: c6b85035\" into nyc-mr1-dev-plus-aosp
am: b2ec84bb
Change-Id: Ic0acda5386b9cb6f6f11d60fb96b6ef626a6f551