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

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

Change-Id: I035cbe090fca681ffe2affd28b597b7d8d916818