am b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors"

* commit 'b736868be917afd5d3ea7e8a8d3d658c4350a239':
  Fix NullPointerException in Bundle#hasFileDescriptors