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

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

Change-Id: I454e4205bd551f15acebc6cdbbb98d24ef5d54fe