Merge "Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 13483998 am: d762136f" into qt-r1-dev-plus-aosp