Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 69474215 am: 2ecd05ad am: 408a4045

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



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