[automerger skipped] Merge "Disable smart lock when in power menu on lock screen" into sc-qpr1-dev am: 60f0d698d5 -s ours am: eadafbb63e -s ours am: 8cb1413a7a -s ours

am skip reason: Merged-In Id353faa1176882b6b9dfb9acd72288a3e0173aa0 with SHA-1 525fd25296 is already in history

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

Change-Id: I93a364d23825507a6f175cd55c038fe4a1a6b72f
This commit is contained in:
TreeHugger Robot
2021-08-19 00:21:26 +00:00
committed by Automerger Merge Worker

Diff Content Not Available