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

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

Change-Id: I18ae9e025d39b439859ceb64d499bb4cbeed81d9