Merge "Don't resume activity if user is locked and encryption is unsupported"...
Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev am: 1327cdc5
am: 004f9a30
Change-Id: Ifcbb0d3fbde8f87052509d5ef0a0b57e013e2245