Merge "Increase the number of notification items that can be shown in...

Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev am: 38526256

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



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