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

Change-Id: I4338f6d60a78a4ec06e05c9d8d42b99fdc8e59d7