Move Scroll Options Under our new Animation section.

Change-Id: I2d8578466828d9e38efac9b6dcc5b0921df74f64
Merge github.com:TeamBliss-LP/android_packages_apps_Settings into lp5.0