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 am: d7602563

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



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