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

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

Change-Id: I3c96c9db67d902b63cb376f19e642454635fab43