Merge "Fix issue #35813125: API Review: android.os > Bundle"