Merge "app.te: prevent locks of files on /system"
am: cc45b87cfa

Change-Id: I17fe3e79b7f673a0703be5be7bb93838cd2f7ed6