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

Change-Id: Ief6ec3dfc5a20ad3f27f79df3502bdace3025b60