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

Change-Id: I760b9a12f7a9109c21bb8e53e1606246ae209a3a