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

Change-Id: Ide06c468c5d872302d3f6c7fe7dc0d69b6ac1b40