[automerger skipped] Merge "Move setup optimization mode to main thread" into tm-qpr-dev am: 3aca71cfc2 am: ea082976a6 -s ours

am skip reason: Merged-In I2de2181321712f89fadc04bf5000aea91a01485a with SHA-1 7423f4390c is already in history

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

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