Android 5.0.0 release 6
Fix NPE when calling unicodeWrap DO NOT MERGE

unicodeWrap isn't null safe so check before calling

Bug:18086401
Change-Id: I74537fff226276733b0475029b4a4a57a0055244
(cherry picked from commit b2215766433478ac1c53d61c08f4844326dfe4f8)
2 files changed