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