Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91

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



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