Merge "Revert "Fix exception handling in getState() binder cache"" into rvc-dev am: 58de85c4 am: 409b13db am: fbc110c7 Change-Id: I61fcec6cff215add65d56fabac5bc2ac7d20637c