Merge "Remove OEM_UNLOCK_PROP usage" into main am: c3838f85ec

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

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