Merge "Clear user fixed flag when changing notification permission" into tm-qpr-dev am: b1d41af4

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



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