Merge "sepolicy: Fix the path of policy.conf" am: 3b06b97173
am: 44badf7562

Change-Id: I1116bc27b2a5deb4c51934d21a132279ab502ce3