Merge "PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES is applicable to override_apex"...
Merge "PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES is applicable to override_apex" into rvc-dev am: e95000a3 am: 195a3a8d
Change-Id: I9c5f360740c2ba62dd11544e2392df56a68f3852