Merge "Merge "Fix an exception while scanning apex packages" into rvc-dev am: 2aab1a4d am: c74e158d" into rvc-d1-dev-plus-aosp