[automerger skipped] Merge "Fix extra dim turns on failed in setting search...

[automerger skipped] Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e2 am: 5f957038 -s ours

am skip reason: Merged-In I52425190cce4ab3cf31be025a743bf8b212fa1f9 with SHA-1 d95d799d is already in history

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



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