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

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

Change-Id: Ifb4534407e4620c833076d0c64756b97b262f9da