Merge "Remove OEM_UNLOCK_PROP usage" into main am: c3838f85ec am: 4ec21ff285

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

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