Merge "Merge "Make ApexManagerTest use resources that are not prebuilt" into rvc-dev am: cd99932241 am: bb88d927bf" into rvc-d1-dev-plus-aosp