Merge "Clear user fixed flag when changing notification permission" into...

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

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



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