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

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

Change-Id: I4ad57b6ecef824d35283a176918cad5d3c1819d6