Merge "Add the option to disable lazy notifications (2/2)" into tm-qpr-dev am: f9748a4c24 am: 6feb852c65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20794246

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