Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main am: c410ea7a am: aa4b1fc9

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



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