Merge pull request #15733 from qingqing01/release/1.3.3

cherry-pick/Fix batch_norm API for data_layout.

python/paddle/fluid/layers/nn.py

@@ -2930,6 +2930,7 @@ def batch_norm(input,
             "momentum": momentum,
             "epsilon": epsilon,
             "is_test": is_test,
+            "data_layout": data_layout,
             "use_mkldnn": False,
             "fuse_with_relu": fuse_with_relu,
             "use_global_stats": use_global_stats