A bit more refactoring in BackgroundDexOptService am: a57ef16375
am: a0358c9e32

Change-Id: Ie1e511761121f13bf106dd888129d5e3b168b818