Merge "Fix behavior of updates to insistent notifs" into sc-qpr1-dev am: 5bda3979 am: bb01aa8d

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

Change-Id: Ib9e6ac55fb139c7c11b59e76881ba3f8c10d74eb