Merge "Add OEM_PAID capability to system api" into pi-dev
am: 8982a81f3c

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa