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

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

Change-Id: Id9dfb47458ef017ea3547ce9e20495f28b4f455d