Merge "Move bootloader_override property" into udc-dev am: f58ea467

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



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