Merge "Fix synchronization on DND settings" into tm-qpr-dev am: eb14229c

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



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