Merge "Merge "Fix exception handling in getState() binder cache" into rvc-dev am: 773cc6249e am: e46da26d89" into rvc-d1-dev-plus-aosp