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

Change-Id: Iaba2ae889fe1a569d68d2838ba583f0d64d1f57a