[automerger skipped] Merge "No scrolling required to see find sensor...

[automerger skipped] Merge "No scrolling required to see find sensor animation" into tm-qpr-dev am: 8d6aade6 am: 3539c9e7 -s ours

am skip reason: Merged-In Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638 with SHA-1 bda3c064 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21010898



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