Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev
am: 1486557

* commit '1486557d10f9969ef31b65e4312bd00b1a6f02ae':
  Handle interaction of Bundle.hasFileDescriptors() with removal

Change-Id: I3e1d35c5fbd6ad2356abe61309f8b6797f3fbbba