Merge "Attempt to clear memory after keyguard PIN entry" into sc-dev am: f16b3f76aa

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

Change-Id: I41d454e024cef527cd4f1f5f7bbf4d58d7b54f74