Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5f am: caabb4fe am: bf0d1925

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



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