Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev...

Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a02151 am: 12471d94" into rvc-d1-dev-plus-aosp am: 569b3b10 am: 613b6845

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

Change-Id: I1503d6b39a87f8f7e3473fdc14817c98ce5cf4d6