Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f06 am: e8409ecf

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



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