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

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



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