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

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

Change-Id: I3b2cc86858be209e64c8da37dd1b37552146cfd7