[automerger skipped] Merge "emulator: move sepolicy to goldfish project" am: 82de42067e -s ours am: 0b2136ad0c -s ours
am: d3228dc901 -s ours
Change-Id: I490adebde12390ad65b1975e920c5489e6ea4089
This commit is contained in: