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 am: 1e591c16" into rvc-qpr-dev-plus-aosp am: ac925a83

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

Change-Id: I2e67c0f23b0d727b3329d1d0a491b0224f7c90a0