Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e2

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



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