Make sure CP2 enterprise queries work when FBE is enabled

Bug: 26679081
Change-Id: Ib58c609d490f72f92dc680c3c8c71ccf3c06219f
1 file changed