Merge "Merge "Force garbage collection after credential verification" into...

Merge "Merge "Force garbage collection after credential verification" into rvc-dev am: 612d9e85 am: e54728c4 am: a5a02768" into rvc-qpr-dev-plus-aosp am: 19a0701e

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

Change-Id: I9cd422052ef745efe3daf75ee3ba7abcd7572ced