add encryption for android L

Change-Id: Iace181773c98f91388b03fa8551b6802fc8dff0d