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

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

Change-Id: I16160df17d88600d73549e07027a14634fc3ddbb