Account for protobuf db handler in connection state when enabled

Change-Id: I1fdc328a8dae3f23313b3737d8f1129a66a7b2a5