Merge "Propagate classpath info for staged apex to PackageManager" am: e583e6d676 am: d17d71ef77

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849818

Change-Id: I53302c7f033b0d4054f63e9bce5b85477d07246c