Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e

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

Change-Id: I06f91490e2adea3e9e3347790036730eec4a3ace