Revive Null check for backward compatibility.
Revive Null check for backward compatibility.

Bug: 21934529
Change-Id: I18e8f01be728e0400f3218a359b0dc9fd97fbbbd

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