[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-v2-dev am: 04b483b4 am: 0ba5ad30 -s ours

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

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

Change-Id: I13796743336e8ef15ba3b547541dabcba8600bdd