Merge "Limit the optimization mode restore mechanism for specific conditions"...

Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c0

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



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