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

Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5f am: 4bcaccf8 am: f9bfc592

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



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