Merge "Merge "Add Developer Options string to xml." into tm-dev am: 566c676d...

Merge "Merge "Add Developer Options string to xml." into tm-dev am: 566c676d am: 74211e40" into tm-d1-dev-plus-aosp am: 323f3ea0

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



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