Merge "Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu" am: f552341204
am: 9776c4cce3

Change-Id: Ie25b00f0eada559b2752cf9f15e4fd34634f3e24