Merge "Remove special case handling of "ro." properties permissions"
am: b45f8179be

* commit 'b45f8179be0fc14f86d5076bdc75a58cca5ef46b':
  Remove special case handling of "ro." properties permissions