Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main am: c410ea7aab am: de2f11c6e8 am: 787451833a

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

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