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

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

Change-Id: Ifea88515d0f6f5fd9618150859fcd70da7d1fed3