Merge "Prevent GC requests from piling up in LockSettingsService" into main am: 7dc33f354d am: 9e0155fb41

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

Change-Id: I40540326d01aac69ff7f588aadc6c38b0c14be90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>