Merge "Update BackgroundDexOptServiceIntegrationTests"