Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 am: bf9f6b4f3b

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

Change-Id: Ie9c4dafb0ac9ad965dd51b9b789d2d41a7606a5d