Fix for bug 2558156: Encodig is null
Fix for bug 2558156: Encodig is null

This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.

Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base