Merge "Add com.android.resolv-file_contexts to /system/sepolicy/apex"
am: ac317b915e

Change-Id: Ia303853a9a0fe93c8723f05a8fa94542c18be1e2