[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 -s ours am: eadafbb6 -s ours

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

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

Change-Id: Ifefe508a02f1b587dbf590be3964b93d2869bd05