Merge "Show dialog to OEM unlock the device for 16k dev option" into main am: 72fd15a678

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974373

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