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: I6c31dcf53c8a8586028fa5c3cb350c7c947b95b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>