Merge "Clarify doc comment for setUnlockedDeviceRequired" am: a0976a1207 am: f6354a20d5 am: 9025d607a0 am: 90099ff85c am: 43374ca204 am: d3d4b21422
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2060058 Change-Id: I00f81983092c70c07ee81e69b5fc5623231dc396 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: