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 am: a3bfaed4

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



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