Merge "Force garbage collection after credential verification" into rvc-dev am: 612d9e85e6 am: e54728c407

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

Change-Id: Ic589dca04d8aa959f5998b22818266689f4a8923