Merge "OtaDexoptService: Add missing return" into oc-dev am: ab516db3e6
am: 6a580bef1f

Change-Id: I3a75fb705d58211c2ecf6937b61722fa12294fd5