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

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



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