Merge "Fix a bug that prevented notification reinflate on user switch." into...

Merge "Fix a bug that prevented notification reinflate on user switch." into tm-qpr-dev am: f28d265a am: 8dcdba87

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



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