Merge "Make LoadClass collect garbage as promised" am: e16473b1da am: 87376c8b47

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

Change-Id: I9ce4b3b580841daf2be9f2df8a6412049ba15c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>