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

Change-Id: Ibcc24d3edd74cade99a67846824b6a0692bbb180