Merge "Merge "Use ParcelableException to put exception in bundle" into rvc-dev...
Merge "Merge "Use ParcelableException to put exception in bundle" into rvc-dev am: 13c7d899 am: 3c7be536" into rvc-d1-dev-plus-aosp am: d7dfb5c9 am: 453710ca
Change-Id: I15612e4c77e989fb2a7b4ed6d13033d03c093070