Merge "Move Settings privapp-permissions to /product"
am: 77cf075561

Change-Id: Ica75df6d7353ff2e8efe3918847799ec32fe89ec