Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
am: 87a35ffae5
am: 218e3151c1
am: 2d73558d68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740 Change-Id: Id394f961c5b219576e6a756a9650155d48109317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: