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

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



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