Merge "Try to encrypt /data/media/obb but ignore failures" into oc-mr1-dev
am: eb29dced71

Change-Id: I561e352eadaa7ea975eb305b5d24e27bef337e51