tree e04392958be26b04f3a240b0f72588fe064e4aad
parent 73ccc0fdcc47115c2fbbfdd1d9b251996d79cd7f
parent 40832590c7a12f08c7f9e8ee2c687a275f13e0c0
author Eric Biggers <ebiggers@google.com> 1696890242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696890242 +0000

Merge changes from topic "locksettings-aosp" into main am: 7df13d67fe am: 7fcb018b7a am: 40832590c7

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

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