am 007e207b: Merge "Frameworks/base: Fix null-pointer check"

* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
  Frameworks/base: Fix null-pointer check