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

[automerger skipped] Merge "NotificationHistory validate position value" into tm-dev am: e73f9cb7 am: eae23fc7 am: 81fa404f am: 11a3aaab am: efa42fc5 -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: I2fd28a269a865d28e6c52c769661537ad3bcc296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>