Merge "Fix app notification toggle" into tm-dev am: d9b15d80

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

Change-Id: Ifb975438756e2bd1080c38404f984b2b5c7a95d8