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
Change-Id: Ic52b4db69fd68ce36ae49db5977389a385c493cb