Merge "Fix blocked sensor chip to hide if settings change." into tm-qpr-dev am: 2b708c99

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



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