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

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

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