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: 156d912c" into rvc-d1-dev-plus-aosp am: efa8cb62 am: 2a33b85f

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

Change-Id: I5f66d25e41a8c484f65861109482b0c9e56b249c