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

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

Change-Id: I2de490cfede802b39795bf3006bcd31067a38bdc