Merge "Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea87 am: 2af4f657 am: be2838c6" into rvc-qpr-dev-plus-aosp am: 696d020d

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

Change-Id: I7662c659bd3411f4b11305d9aeeb47130a86ae06