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

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

Change-Id: Ia2198a7e555c0345d2ddf6904a3db9b92169fe2c