Merge "MediaRouter: Handle WRAP_CONTENT in setViewPaddingBottom()" into mnc-ub-dev