Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev