Merge "Fix bug #6293328 android.view.cts.ViewTest#testLayoutDirection fails on JRN04 soju-userdebug" into jb-dev