Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba53 am: 968a865d

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



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