Android CTS 7.1 Release 12 (4439252)
Merge "Fix Gatekeeper unit test"