am c957fa3b: am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev
am c957fa3b: am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev

* commit 'c957fa3bcc42ebed337582f98c8ebb8f2d1148e5':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base