[automerger skipped] SEPolicy: Merge folder non_plat and r_non_plat am: 6f092d1598 -s ours am: 355a286f15 -s ours am: 703a014f25 -s ours am: 115fd074d2 -s ours am: 167381bf8f -s ours

am skip reason: Merged-In I3f697ba364098f642e241ba7b14d23e4187780b2 with SHA-1 9f0dee706b is already in history

Original change: https://android-review.googlesource.com/c/device/mediatek/wembley-sepolicy/+/1807483

Change-Id: I6508a11780505d96035a3a38246a79dfa3917513