Merge "Merge "Fix an exception while scanning apex packages" into rvc-dev am: 2aab1a4d49 am: c74e158db3" into rvc-d1-dev-plus-aosp am: bef16a2983
Change-Id: I2b77d073106c36e0c501f46203d38416326366b3
This commit is contained in: