[automerger skipped] Merge "NotificationHistory validate position value" into...

[automerger skipped] Merge "NotificationHistory validate position value" into tm-dev am: e73f9cb7 am: 49f4ffb7 am: 8c053ef9 -s ours

am skip reason: Merged-In Ica98d82d7d7c1c9c0defcff8d96bf5f36e8f5d36 with SHA-1 97c957a0 is already in history

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



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