Merge commit \'6264c4c194e0bbcd060409e0e8c0abfaae3bdf10\' into mnc-dr2-dev-plus-aosp
am: a10bd04544

* commit 'a10bd04544feab7a5bcc4fa4f6fb3f10513f1c31':
  libbinder: Return UNEXPECTED_NULL when appropriate