Merge "Fix exception handling in getState() binder cache" into rvc-dev am: 773cc6249e am: f59b94612c am: dbd667890d am: 60e0cc6140

Change-Id: I3080dff5ecf54dceef0d6840bfe6af5a4dd832fa