Merge "Reset Optimization Mode of apps when users reset app settings." into...

Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev am: 614d2dfc am: 166c0633

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



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