Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3f am: 7c47ae92 am: ec8c96f5

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



Change-Id: Ie709ea8e4881f6829dce58defed68198cafb60dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>