Merge "Check that a Runtime APEX has been activated before running otapreopt." am: 59234af3e9 am: d55a427204 am: 0c5bf69471
am: 5c092f7ee4

Change-Id: I8b10c5d8c78031d3e17bfd57297cf373042b5ec5