Merge changes from topic "audit-lock-pattern-utils" into tm-qpr-dev am: d9e17f5f

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



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