Merge "Return null for getSubmitPdu() for encoding failure instead of NPE" am: 75214226c6

Change-Id: Ib374f2ecf640ed0064b5033251f49ec2febf8801