am 11f6f0ef: am 18e5bd3e: Merge "Address selinux_policy.xml FileNotFound exception"

* commit '11f6f0ef556131e887d84537df271db17b934008':
  Address selinux_policy.xml FileNotFound exception