Merge "Revert^2 "Make default_prop only readable from coredomain"" am: 150355b1c3 am: a2e0d70e89

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1549899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I125385d402e29bdd962caa7274c28ad6abc7066e