Merge "Fix DrawableCompat.getLayoutDirection() shim pre-M" into mnc-ub-dev