[automerger skipped] Merge "Add strict_mode: false" into main am: 76d7864b am: b7c686c6 -s ours

am skip reason: Merged-In I4381446dac381a34747043c564cf5288a2e16725 with SHA-1 4551e069 is already in history

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



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