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

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

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



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