Merge "Fix width of Seekbar when enabled but not seekable" into rvc-dev am: b011b821 am: 9352b31b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953554

Change-Id: I10b271875122f60adfed928954e6b4a3edf838fb