Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 12180650 am: bbde3994

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



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