Merge "Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()" am: f5cc73d25f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878339

Change-Id: I43dff41f44fb904c6c4d44b870c9de88945f04f3