Merge "Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8 am: e47f682c" into oc-mr1-dev-plus-aosp