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

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



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