Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"