[automerger skipped] Merge "Disable smart lock when in power menu on lock...

[automerger skipped] Merge "Disable smart lock when in power menu on lock screen" into sc-qpr1-dev am: 60f0d698 am: 1e4b7c11 -s ours am: d427ca79 -s ours

am skip reason: Merged-In Id353faa1176882b6b9dfb9acd72288a3e0173aa0 with SHA-1 4e518ca3 is already in history

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

Change-Id: Ia375854e7b090c994f3edc9aa441a6f6cdd8b8d2