Merge "Allow forward locked apps to be in ASECs" into jb-dev