Merge "Allow rolling back Turn Off Work 2.0" into udc-dev am: b6426114 am:...

Merge "Allow rolling back Turn Off Work 2.0" into udc-dev am: b6426114 am: a5f52a70 am: a87d8448 am: d71ba65f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23106942



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