Merge "Update unseen filter setting access to account for tri-state" into...

Merge "Update unseen filter setting access to account for tri-state" into tm-qpr-dev am: de53d399 am: d50083d2

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



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