[automerger skipped] Developer options should reflect the correct DeviceConfig value for ReleaseFlag. am: 13517070d8 am: 2fbb34fc7b -s ours

am skip reason: Merged-In I5d83207cf454c60278fd02e59199207e855d51a8 with SHA-1 9eb68bb7cf is already in history

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

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