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

Change-Id: I6d1a646057f5102272cf77b6e86e353e70ccfff1