Merge "Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885 am: d762136f02" into qt-r1-dev-plus-aosp
am: 9741440ab9

Change-Id: Ia5fc024f9f6885dbf5c00e0d8da46cdd1e24980c