[automerger skipped] Merge "Move Settings privapp-permissions to /product" am: 77cf075561 am: 1b8c6b40db
am: 88235ba364 -s ours
am skip reason: change_id I34fcab908db5b7a96a50b45bb45941282b05a82d with SHA1 948abe768e is in history

Change-Id: I23317dc044b1bd431c49e500ab1b6799ec6fcf83