Split package and permission lock.

The first milestone towards mainlining permission.

Bug: 158736025
Test: manual
Change-Id: I01246d446ff34a43ff7e954569f4422cee942f24
3 files changed