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

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

Change-Id: Iffa79ace1ee8d419e889b883a8848919a14d5ae9