Merge "Added platform-bootclasspath" am: dedc39bc2c am: 0430bb8fd7 am: 071181a329

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

Change-Id: I352d2b82b338d41611e3c9e93393703691730461